* lisp/startup.el (fancy-splash-frame): Extend the fix for Bug#16014 to the Cygwin...

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 732484654cb121658c3a8b06901314ff2a6f1070..161c22c2d514b2fa68b58ee39950bdab62b39cd5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-08-29  Ken Brown  <kbrown@cornell.edu>
+
+       * startup.el (fancy-splash-frame): Extend the fix for Bug#16014 to
+       the Cygwin-w32 build.  (Bug#18347)
+
 2014-08-28  Glenn Morris  <rgm@gnu.org>
 
        * tar-mode.el (tar--extract, tar-extract):

diff --git a/lisp/startup.el b/lisp/startup.el
index a229207a2c85f2096024909fd4ccf0b09d7f3de7..58e970814b9842b3fce1c8329f5211821db29e69 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1812,7 +1812,7 @@ we put it on this frame."
   (let (chosen-frame)
     ;; MS-Windows needs this to have a chance to make the initial
     ;; frame visible.
-    (if (eq system-type 'windows-nt)
+    (if (eq (window-system) 'w32)
        (sit-for 0 t))
     (dolist (frame (append (frame-list) (list (selected-frame))))
       (if (and (frame-visible-p frame)